spinbutton: Use dispose instead of destroy
authorMatthias Clasen <mclasen@redhat.com>
Tue, 5 May 2020 20:49:20 +0000 (16:49 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 5 May 2020 22:23:54 +0000 (18:23 -0400)
The destroy vfunc is going away.

gtk/gtkspinbutton.c

index 0c790a6fff88549a1aa4a1059e7e5780b0f754ac..43305ae9cefd299327cdfe828b9f4bb9fafa2a81 100644 (file)
@@ -261,6 +261,7 @@ enum
 static void gtk_spin_button_editable_init  (GtkEditableInterface *iface);
 static void gtk_spin_button_cell_editable_init  (GtkCellEditableIface *iface);
 static void gtk_spin_button_finalize       (GObject            *object);
+static void gtk_spin_button_dispose        (GObject            *object);
 static void gtk_spin_button_set_property   (GObject         *object,
                                             guint            prop_id,
                                             const GValue    *value,
@@ -269,7 +270,6 @@ static void gtk_spin_button_get_property   (GObject         *object,
                                             guint            prop_id,
                                             GValue          *value,
                                             GParamSpec      *pspec);
-static void gtk_spin_button_destroy        (GtkWidget          *widget);
 static void gtk_spin_button_realize        (GtkWidget          *widget);
 static void gtk_spin_button_grab_notify    (GtkWidget          *widget,
                                             gboolean            was_grabbed);
@@ -341,10 +341,10 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
   GtkWidgetClass   *widget_class = GTK_WIDGET_CLASS (class);
 
   gobject_class->finalize = gtk_spin_button_finalize;
+  gobject_class->dispose = gtk_spin_button_dispose;
   gobject_class->set_property = gtk_spin_button_set_property;
   gobject_class->get_property = gtk_spin_button_get_property;
 
-  widget_class->destroy = gtk_spin_button_destroy;
   widget_class->realize = gtk_spin_button_realize;
   widget_class->grab_notify = gtk_spin_button_grab_notify;
   widget_class->state_flags_changed = gtk_spin_button_state_flags_changed;
@@ -1008,11 +1008,11 @@ gtk_spin_button_finalize (GObject *object)
 }
 
 static void
-gtk_spin_button_destroy (GtkWidget *widget)
+gtk_spin_button_dispose (GObject *object)
 {
-  gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (widget));
+  gtk_spin_button_stop_spinning (GTK_SPIN_BUTTON (object));
 
-  GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_spin_button_parent_class)->dispose (object);
 }
 
 static void